Cleaned db and added AJAX timeout