Cleanup of some duplicate junk