Code cleanup

A little bit more code cleanup - removing unnecessary lines