Large code cleanups: