Cleanup redundancies