Removed stuff that's not required