Remove unused classes and refactro Type Interceptors