General clean-up
removed all stuff I don't use