Build cleanup & checkstyle

Leave the star import