Remove not needed stuff and re-naming