Removed stuff that wasn't needed