Fixed #1. There is no need to remove or add shortcodes, since the gallery can be hooked through the  filter. Because of this, we do not need #2 anymore :D