[aerogear-issues] [JBoss JIRA] (AEROGEAR-9001) Cleanup the code after the refactoring, e.g. remove any unused code.