Delete obsolete layout files in favour of JLayoutHelper and make use of JLayoutHelper where possible

A couple of layouts became obsolete when JLayoutHelper was introduced. They either were not used at all or just acted as a proxy to then call JLayoutHelper.