cleanup cli and options