Removal off remaining Foundation code