Remove dupicate code block - cleanup