Removed un-needed code for #36