some code cleanup & optimizations
removal of unused field
some code cleanup & optimizations
Merge pull request #959 from ahmetmircik/codecleanups

Code cleanups & optimizations