SW player cleanup fixed