code cleanup, removed not needed code