Init
Remove leftovers
Update deprecated functions