bug/201/remove-ajax-handler



<!---
@huboard:{"order":202.0,"milestone_order":205,"custom_state":"ready"}
-->