removing layout. I think this wold be fine, we need to asteblish architecture