Some annotation changes, removed unecessary value = XXX in annotation annotations.