Compilation cleanup