remove comment stuff for now