First step in the many steps of doing a complete code review and cleanup.