Codes cleanup