deleted some no longer used stuff