Remove deferred code as it is not necessary