Removed everything from this branch that isn't a JavaDoc thing