Removing unnecessary async methods
Better remote error handling + cleanup