Commented some CLI switches due to API not working properly