removed dependencies with the Rest library and many other changes