Remove old constructor