Big rename
Remove annotations