Removed lots of stuff