Get rid of unnecessary Foundation code