Cancel reverts back to the saved filter states

Also cleaned up unused files