Delete Measurement and database changes

Delete Measurement and database changes