Clean up unused aspectj code.
Bump version number