Cleanup and setting data to be optional