Removed unused varialbes and other commented parts