Removing unnecessary files and cleaning up

_super was being defined three times