Cleaned up the data provider project and some of the web code