Finishing touches.

Removes old code, updates' messages.