R# 7.1 compilation, cleanup