removed all unused variables