Removed lots of testing rubbish