Clean up sizetip patch: remove separate header file and // comments