Remove old layout
It's a start