Middleware Javadoc / Cleanup