general cleanup of breakage after conversion to post processing