[Refactor] - Cleaned up some unused files