Cleaning redundant stuff