removed not needed code blocks