Removed two unnecessary modules and readded one

Two unnecessary modules have been removed as they are not in use at this
stage. The authz_core_module has been readded to allow basic
authentication control.