Cleaned up a little

1) deleted some unused layouts and an unused fragment.
2) cleaned up various test messages.