Elminated useless imports, and fixed some unnecessary inheritance