removed lots of unnecessary code :)