Remove commented out code and remove rebuild option.