Cleanup and unfinished commandline interface