Code cleanups and maven profiles