Remove need for Guava
nuke random semicolons :P