Remove redundant code, fix trimmed sprite sheets