Removed not used vars