Remove uneeded function
Move deprecated functions together.