Syntax clean up and remove a unused file