Remove needless code