Remove redundant code, fix trimmed sprite sheets
Merge pull request #478 from Nibbler999/dev

Remove redundant code, fix trimmed sprite sheets