SRAMP-561 cleanup