Remove unfinished arg handling, for now