General redundancy cleanup