removing extended rest server, cleaning up code