Cleanup.

Preparing the directory, removing unused files