code cleanup from collision fix