delete obsolete stuff
Big update & cleanups