daniel: stocos cleanup
daniel: stocos cleanup