Updating paths and cleanup