Cleanup of the codebase. I should probably rework the part taking care of the siganture since it's not really used by the nokia store, but not today.