Cleaning up and more deprecated elements replacements