According to my intellij it's not used anymore.. remove?