Clean up clean up yay