project refactor
removing annotations (not properly tested though)