Removed IE code, cleaned up test code
Merge branch 'wip'