Added @Deprecation annotations
Removing trailing whitespace
Check for deprecation annotation vs. javadoc consistency