added setup cleanup