feb5c53 Remove extra susy layout code