cleaned up shot state