Cleaned out some cruft from the code.