Minor cleanup of subsite code