Remove some crap code