Minor modifications at base, cleanup unused libraries