[NUCCORE-1117] Further cleanup of interface