Cleaning up conditions, removing unused files