Cleaned up further, removed old unused files