Net windows builds again, removed redundant functions