Remove PSI from several classes and remove using ServiceLoader