Cleaning up extraneous comments left from previous architecture