Removed interfaces

Best to keep them in another branch until they are ready