TODO: add a list with things we should cleanup with respect to this after 1.0 <!--- @huboard:{"milestone_order":1083.0} -->