Removing unused and windows-only references