deleted unused and commented code