cleanup and working on PROBCORE-302