Minor cleanup, removed unused library