Removals and some variable names cleanups.