removed extra code that has not been implemente