Got rid of un-used functions.