Delete deprecated and not-useful code