FIX: Drop unused or unused data if data was send though command api