Removed and fixed blocks