Remove old code
Refactor window size