drop comments, defer is required until this can be refactored further