removed stuff not being used and copied info accross