Remove code that is not being used anymore