cleaned useless functions