FIX: remove extra controller