removed lots of cruft and cleanedup the setup