Removed non-needed code