removed not needed vars