Housekeeping, removing un-needed comments