subspy

cleanup