Tweak keywords.
Removed old amqp library.