Cleaned up old collision