Removed unnecessary interfaces and methods.