Cleanup unused code and support quote headers like: 2013/1/31 Lawrence Pit <lawrence.pit@example.com>