fixed name and removed uneeded code