Fixed bugs, removed some not need creators