Cleanup and remove obsolete code.
Add grid for organizations.