Version 3.6 final final

- Remove gifts