removed random excess stuff