Cleaned up Journal, removed deprecated functions