remove grid clear, over ambitious for now
update components to use new bp var
simply push & pull