SRAMP-510 Maven cleanup