Add missing language items
Clean up blacklisted code