Cleanup dependancy variables
Removed ebnf grammar