removing unneeded form layouts and stubs