Remove Blocks requirement

The relevant code has been moved to prototypes