Removed some unneeded traits and bases