Cleaning up..

2