Remove some unused resourcs and some small fixes