wip

core specs passing
Remove some unnecessary comments