Cleaning garbage code