Formatting, removed unused code, and a new block

Cables will soon be added for the new block.