Changed data path and cleanup