Remove a block which was using wrong context
Remove unnecessary logger
cleanup
Remove redundant variable