Deprectaded unused code
More comments