removed not needed things