[2.2] Update

Removed un-needed code