Removed Pony dependency