REMOVE bad use of self