remove logging
better identifier checking