getting rid of unused code - part I