Remove not needed stuff and outdated comments