Continue removal of behaviour methods