More refactoring (remove empty arrays of behaviour if none required)