Clean up for new implementation

Cleaned up all old implementation files.