removal of unused code