Removed no longer needed code