Cleaning out comments and old code