Buffer WO updates
cleanup
removed dead code
final cleanup and refactor