Code cleanup. Restored model debug drawing.