Cleaning up files and code related to windows

Applied changes per previous discussion