Some cleanup based on Primo project realizations