removed stuff that was on the original superclass file