Code cleanup done