clean up usage handling