removed some function