slimming down some stuff