Remove debug features to comply with university ox