Removed dead code, fixed broken windows.