get rid of excess unused code