First Half of changes for Dept: Remove Location functionality. also some other minor bug fixes