More cleanups for implementation.