Cleanup redundancy