Another attempt at removing padding