UPDATED removed no longer needed code.