Removed redundant layout params and obsolete cache