Got rid of command cruft; workaround for error