cleaning up after new ui