Removed some deprecated files
Cleaned up workspace