removed class on self static calls and removed this