Cleanup some useless code