Removing more build junk