Removed calls to undeclared variable