Removed references to subscription view, until subs are implemented properly