code cleanups & remove redundant lines
code cleanups & remove redundant lines
Merge pull request #968 from ahmetmircik/cleanups

Cleanups