fix command names and get rid of unused stuff