Merged release-two version of client/block
Cleanup unused files
Fix merge conflicts.