removed some code
some cleanup