Fix white space, remove functions.inc as it is no longer used, symantic stuff