Javafx cleanup (DO NOT MERGE)