removed some leftover cruft