Cleaning up a bit. Redundant debug & unused code
Added single-item queue to allow retrieval of the previous message