[NUCCORE-1117] Clean up of some methods