More cleanups, dead code deletion