Code Cleaning before delivery