Linux compilation + removed unused functionality
Linux compilation + removed unused functionality (2)