Fixed issue: Removed not needed code