removed some not useful code