annotation fix; ajax-specific listeners removal