Messaging refactored. Test pages removed