Remove some needless code