getting rid of some warnings, and getting rid of unused layout