cleaning up with anticipated facade api