[Layout]: removed deprecated methods
[Jaws_Layout]: tail of last commit