removed blocks, fixed routes and references