Clean up redundancies