removed not used stuff