remove unused and commented code