Removing unused code and adding AspectJ comments