Remove unused import
Clean up lib