fixed some code
removed some code