Removing more flot code