Removed autopickup dependency