Remove some debug statements
Turn warning for non-existent variable into a message