Removed expanders based on design review