renaming functions, dropping useless functions