Just some clean up for clean compiling