Slimmed Down

Removed hard coded messages.