Pulled out unwanted methods introduced earlier.