Restore line rendering
Remove unused method and debug messages
Restore squares for labels