Revert "added command line execution logic"

This reverts commit c67ad21aa14cf730078c3167d513c234438a0f8d.
some minor refactorings