Cleaned up, deleted the Meteor part