Improved resolver and removed unused classes.