SRAMP-423 cleanup