Removed unused stuff from annotations