Cleanup and fixes

Signed-off-by: sanoj <sunnikrishnan@stec-inc.com>
Removed Barrier Handling code
Work in Progress
Some more Fixes and code cleanup
Signed-off-by: sanoj <sunnikrishnan@stec-inc.com>