removal before adding it all back in
adding content back in for 1.15.5