Initial data clean up.