Merge pull request #225 from lincolnthree/java-ee-rules-cleanup

Clean up Java EE rules.