cleanup, reorganization of tracker stuff