Code cleanup still in process.