Further cleanup of compil chain