DataSinkApp - Clean Up Project