Removed lots of code