much needed cleanup