Removed database and web service stuff
Journal modified
Removed more junk files