cleanup all, added globals