Remove extraneous parts from tuple handlers
Comment about main.cpp