Add Amazon service definition. Cleanups.