add remove subcommand, update header