- removal of some unneeded code