Remove listener and dispose logic which makes no sense anymore