Cleaned up cruft from unfinished change