Removed old pick system