Merge "Remove deprecated code from stack & expanded view"