More cleanup
More fixes
Remove obsolete statements