Clean up and removed buggy/unused libraries