Cleaning up generic requests
White noise: minor Javadoc change
Removing unused class