completed removal of code functionality