Some system spec cleanup