Cleaning of unused/debuging files.

Refactor of methods classed as complex in Block class