Cleanup for sm changes, remove output, use local imports