Remove extra susy layout code