Remove old interfaces and fix references in Main activity