Removes attach to Window
Merge pull request #1165 from seanpaultaylor/next

Removes attach to Window