COSMIT clean up old code that was commented out!