Cleaned out some cruft code