remove comment & updated asset handling