Start with command form cleanup