Pull code from upstream and (tried to) make it work without AspectJ.
Remove some files.