Update Meteor and reduce complexity