Remove not necessary inputs and add initial data