cleaned up data source, removed extraneous self references