Remove aws-java-sdk group manipulation