Auto-Return cleanup. Working to resolve: websharks/s2member#205