Remove some debug and some lookups()