Blocks, commit 2

Removed unused imports and IIcon stuff. Other stuff has been changed
sporadically and is not yet done.