Code clean up done.