Cleanup some code and remove DX11 option from build