Clean out old, incomplete code