removed useless functions