Remove extra methods
Add support for replygif