Fix block management in JS / Clean entity, view, field classes