removed some needless code