Clean up for bugs and non save/preview use