commented and removed some code