Funq cleanup2