Improved removing of code tags