Some  more filesize optimization

1002b including license header