removing and cleaning code we are not using