Cleanup of some variables. Removal of some unnecessary files.