remove old & commented out code