Get rid of some useless, warny code