Removed some left-over cruft