Got rid of unused functions.