Cleaned up Journal, removed deprecated functions
Merge pull request #534 from JohnMai/anthonylim

Cleaned up Journal, removed deprecated functions