Remove Interfaces and Exceptions