cleanup
cleaned up use cases