clean up com.highlander