Big cleanup, remove uselss code, use 40 bytes on A4 pkg