remove aspectj; reformatted