clean up definitions