IMRU code cleanup