Removed unused library, some clean up