Cleanup Interfaces and BaseClasses