Change annotation system
Remove comments