Remove methods from old approach
Add step to initialization