WIP -- more proc removal
WIP -- port more