Got rid of some logging and unneeded layout.