Removed some interfaces
Removed more Interfaces