Removed duplicated code blocks (#615)