consider rename? and remove commented out code