removed some more needless code