added TODO for cleanup of gmail specific classes