removed stuff that wasn't needed