Removed obsolete code
Merge pull request #1791 from SoftCreatR/patch-1

Remove obsolete code