Removing legacy code
Removing legacy files