rapp spec cleanup