Anand - added soft asserts and removed unwanted hooks.