Update paths and remove server