Further cleanup and integration.
Removing old files...