Cleaning code

Meteor 1.0