Remove debug code, clean-up place representation
Remove debug code, clean-up place representation