Removed unneeded data prep