-Removed unused block.js
-General Code fixing up