Removed unused data members, the block profiles are apparently not
needed; updated TODOs, checked coverage