locking composer
cleanup