replaced active support and removed xml