Converted unecessary Expandables