Remove comments - closed #16