Remove load() and reorganisation of init