Refactor unused classes, resolved 1 software issue, added javadocs