Cleanup work, plus sideProxy added