Cleanup of generics.
Controller setup for master, worker and frontend done.