Remove non-free resources & fix comments