Quick organizations

removing useless functions