Removed unneeded code and fixed warning
Merge branch 'master' into monodev