refactor & removed rarely used annotations(they are not useful).