Old code removed, implementation in process.