Remove unused subscription logic
Use Java6 explicitly