removed unused variables and... stuff