Improved noise removal