Remove old constructors, update comments