Add three functions to take care of the specs
Remove unused includes