Added block layer to the map.
Removed unused variables from Unit