Remove system_command for now
Merge branch 'develop'