Removed duplicate classes already linked in lib