minore fixes.
removed leftovers
Merge pull request #1 from gAmUssA/fixes

minor fixes