Removed unnecessary code

Window classes removed