Feature/remove fb in jdk