Remove bad practices.
Merge pull request #1398 from drak/bad_practice

Remove bad practices