Refactor|BiasSurface: Addressed current map assumptions; cleanup