Remove a few more files causing compile issue