Cleaned up MQP project