Hardcoded Command line arguments removed