minor cleanup of unecessary code.