[TASK] Remove proxy stuff